Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add accounting dimensions to Supplier Quotation (backport #38142) #38173

Merged
merged 2 commits into from
Nov 19, 2023
Merged

feat: Add accounting dimensions to Supplier Quotation (backport #38142) #38173

merged 2 commits into from
Nov 19, 2023
+50 −3

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 18, 2023

This is an automatic backport of pull request #38142 done by Mergify.
Cherry-pick of 089da45 has failed:

On branch mergify/bp/version-15-hotfix/pr-38142
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 089da459f7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
	modified:   erpnext/hooks.py
	modified:   erpnext/patches.txt
	new file:   erpnext/patches/v14_0/create_accounting_dimensions_in_supplier_quotation.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/buying/doctype/supplier_quotation/supplier_quotation.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@deepeshgarg007 @mergify
feat: Add accounting dimensions to Supplier Quotation
7d4ac7e 
(cherry picked from commit 089da45)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@mergify mergify bot added the conflicts label Nov 18, 2023
@mergify mergify bot requested a review from s-aga-r as a code owner November 18, 2023 14:11
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Nov 18, 2023
@deepeshgarg007 deepeshgarg007 merged commit 7be7c6a into version-15-hotfix Nov 19, 2023
10 of 11 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-38142 branch November 19, 2023 11:38
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.3.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

@s-aga-r s-aga-r Awaiting requested review from s-aga-r

Assignees

@deepeshgarg007 deepeshgarg007

Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @deepeshgarg007